Auto merge of #3411 - alexcrichton:tweaks, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 16 Dec 2016 00:28:35 +0000 (00:28 +0000)
committerbors <bors@rust-lang.org>
Fri, 16 Dec 2016 00:28:35 +0000 (00:28 +0000)
Minor build tweaks

* Clean out OpenSSL when building
* Test 32-bit Cargo on OSX, not the 64-bit version on the 32-bit builder

1  2 
Makefile.in

diff --cc Makefile.in
Simple merge